Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes a crash on calling TemplateUrlServiceFactory when main Activity is stopping #21328

Merged
merged 1 commit into from
Dec 11, 2023

Conversation

SergeyZhukovsky
Copy link
Member

@SergeyZhukovsky SergeyZhukovsky commented Dec 11, 2023

Resolves brave/brave-browser#34826
It's an attempt to fix the issue. I couldn't find any reason why we had that code, search widget works fine, it always uses a standard tab search engine even though we can set a different one for private tabs.

Submitter Checklist:

  • I confirm that no security/privacy review is needed and no other type of reviews are needed, or that I have requested them
  • There is a ticket for my issue
  • Used Github auto-closing keywords in the PR description above
  • Wrote a good PR/commit description
  • Squashed any review feedback or "fixup" commits before merge, so that history is a record of what happened in the repo, not your PR
  • Added appropriate labels (QA/Yes or QA/No; release-notes/include or release-notes/exclude; OS/...) to the associated issue
  • Checked the PR locally:
    • npm run test -- brave_browser_tests, npm run test -- brave_unit_tests wiki
    • npm run lint, npm run presubmit wiki, npm run gn_check, npm run tslint
  • Ran git rebase master (if needed)

Reviewer Checklist:

  • A security review is not needed, or a link to one is included in the PR description
  • New files have MPL-2.0 license header
  • Adequate test coverage exists to prevent regressions
  • Major classes, functions and non-trivial code blocks are well-commented
  • Changes in component dependencies are properly reflected in gn
  • Code follows the style guide
  • Test plan is specified in PR before merging

After-merge Checklist:

Test Plan:

there is none.

@SergeyZhukovsky SergeyZhukovsky added CI/skip-macos-x64 Do not run CI builds for macOS x64 CI/skip-ios Do not run CI builds for iOS CI/skip-windows-x64 Do not run CI builds for Windows x64 labels Dec 11, 2023
@SergeyZhukovsky SergeyZhukovsky self-assigned this Dec 11, 2023
@@ -803,7 +792,6 @@ public void initializeState() {
setLoadedFeed(false);
setComesFromNewTab(false);
setNewsItemsFeedCards(null);
BraveSearchEngineUtils.initializeBraveSearchEngineStates(getTabModelSelector());
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I moved it to finishNativeInitialization as it does native calls inside.

Copy link
Contributor

@samartnik samartnik left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

if (profile != null && profile.isOffTheRecord()) {
// Set normal DSE as an active DSE when brave goes in background
// because currently set DSE is used by outside of brave(ex, brave search widget).
BraveSearchEngineUtils.updateActiveDSE(profile);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@SergeyZhukovsky are we okay removing the change here ?

Copy link
Member Author

@SergeyZhukovsky SergeyZhukovsky Dec 11, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I verified such steps:

  1. Set standard tab SE to Brave.
  2. Set private tab SE to Qwant.
  3. Made some search on both and made sure they are correct.
  4. Switched to Private tab, closed Brave.
  5. Added a search widget.
  6. Tried to search via widget and made sure Brave SE is used in a standard tab is used for that.

Do you have other steps or do you know why we added the above?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't see any reason why it's there, but I'll keep an eye what happens once the change hits users.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you verify the change with quick action search widget we have ?
Steps :

  1. add widget on then home screen
  2. open brave app and change search engine from Brave to something else.
  3. Minimize the app and check widget, if it shows the write search engine on the url bar.

If above looks good, we are good to go ahead with the change.

Copy link
Member Author

@SergeyZhukovsky SergeyZhukovsky Dec 11, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Screen_recording_20231211_152350.webm

Copy link
Contributor

@deeppandya deeppandya left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@SergeyZhukovsky SergeyZhukovsky merged commit 6614cd9 into master Dec 11, 2023
@SergeyZhukovsky SergeyZhukovsky deleted the android_searchengine_crash branch December 11, 2023 21:18
@github-actions github-actions bot added this to the 1.63.x - Nightly milestone Dec 11, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI/skip-ios Do not run CI builds for iOS CI/skip-macos-x64 Do not run CI builds for macOS x64 CI/skip-windows-x64 Do not run CI builds for Windows x64
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Crash on TemplateUrlServiceFactory call
4 participants